From ea569b33d035818df856d9eb8810a70791e5d2a8 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Mon, 12 Dec 2005 23:58:59 +0000 Subject: [PATCH] Write CR/LF only from NON-Windows based platforms. --- gpsbabel/bcr.c | 12 +++++++++--- gpsbabel/stmwpp.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gpsbabel/bcr.c b/gpsbabel/bcr.c index e2e1e58e9..5dd58435d 100644 --- a/gpsbabel/bcr.c +++ b/gpsbabel/bcr.c @@ -40,6 +40,12 @@ #define R_EARTH 6371000 /* radius of our big blue ball */ +#if defined (__WIN32__) || defined (__CYGWIN__) +#define CRLF "\n" +#else +#define CRLF "\r\n" +#endif + /* 6371014 would be a better value when converting to f.e. to mapsoure, but this seems to be used by Map&Guide when exporting to XML. @@ -373,7 +379,7 @@ void bcr_write_line(FILE *fout, const char *key, int *index, const char *value) { if (value == NULL) /* this is mostly used in the world of windows */ { /* so we respectfully add a CR/LF on each line */ - fprintf(fout, "%s\x0d\n", key); + fprintf(fout, "%s%s", key, CRLF); } else { @@ -381,9 +387,9 @@ void bcr_write_line(FILE *fout, const char *key, int *index, const char *value) tmp = (value != NULL) ? xstrdup(value) : xstrdup(""); if (index != NULL) - fprintf(fout, "%s%d=%s\x0d\n", key, *index, tmp); + fprintf(fout, "%s%d=%s%s", key, *index, tmp, CRLF); else - fprintf(fout, "%s=%s\x0d\n", key, tmp); + fprintf(fout, "%s=%s%s", key, tmp, CRLF); xfree(tmp); } } diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c index 638ee4adf..ae2100299 100644 --- a/gpsbabel/stmwpp.c +++ b/gpsbabel/stmwpp.c @@ -33,6 +33,12 @@ static waypoint *wpt; #define MYNAME "STMwpp" +#if defined (__WIN32__) || defined (__CYGWIN__) +#define CRLF "\n" +#else +#define CRLF "\r\n" +#endif + #define STM_NOTHING 0 #define STM_WAYPT 1 #define STM_TRKPT 2 @@ -248,7 +254,7 @@ stmwpp_waypt_cb(const waypoint *wpt) fprintf(fout, ".%03d", wpt->centiseconds * 10); break; } - fprintf(fout, ",\r\n"); + fprintf(fout, ",%s", CRLF); } static void @@ -260,7 +266,7 @@ stmwpp_data_write(void) else track_index = 1; - fprintf(fout, "Datum,WGS 84,WGS 84,0,0,0,0,0\r\n"); + fprintf(fout, "Datum,WGS 84,WGS 84,0,0,0,0,0%s", CRLF); switch(global_opts.objective) { -- 2.30.2